Reconcile merge conflicts from before. Oops.
authorrobertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Mon, 5 Aug 2013 03:02:23 +0000 (03:02 +0000)
committerrobertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Mon, 5 Aug 2013 03:02:23 +0000 (03:02 +0000)
commit33809c430ffc1de99ff0cbb05c0633595cd98538
treec5fb680065ede382742660578488e29a8160d0c6
parent8320f2a8745efb7c78c4bfcd7d4fde5d83cbb8ad
Reconcile merge conflicts from before.  Oops.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4507 f51c46e8-681c-474f-0cfe-069cfd0219fb
gpsbabel/humminbird.cc